Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: fixing key order in qtree plugin #2028

Merged
merged 1 commit into from
May 2, 2023
Merged

fix: fixing key order in qtree plugin #2028

merged 1 commit into from
May 2, 2023

Conversation

Hardikl
Copy link
Contributor

@Hardikl Hardikl commented May 2, 2023

Testing with hidden flag with custom template changes, count is same for both zapi/rest, and qtree labels like export_policy and oplocks are available in quota metrics same as 22.05 Harvest release.

curl -s http://localhost:13006/metrics | grep qtree_disk_limit
qtree_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_1",oplocks="enabled",qtree="harvestqtree",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="Kbyte",volume="astra_ci_vc_esxi_24_75_data_root"} 224
qtree_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_7",oplocks="enabled",qtree="trident_qtree_pool_trident_TBWTPBZIMD",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 0
qtree_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_2",oplocks="enabled",qtree="astra_ci_vc_esxi_24_75_data_root",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="Kbyte",volume="astra_ci_vc_esxi_24_75_data_root"} 0
qtree_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_5",oplocks="enabled",qtree="trident_pvc_c182b0a0_5c5f_488a_9600_3fbbca81093b",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 8388608
qtree_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_3",oplocks="enabled",qtree="trident_pvc_a39048cd_6f45_4c42_b13b_fc00b83ca276",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 8388608
qtree_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_4",oplocks="enabled",qtree="trident_qtree_pool_trident_CGUEQCBMBI",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 0
qtree_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_6",oplocks="enabled",qtree="trident_pvc_79d175b7_d8ef_49bb_a4dd_918c3da74383",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 20971520


curl -s http://localhost:13006/metrics | grep qtree_disk_limit | wc -l
       7

curl -s http://localhost:13007/metrics | grep qtree_disk_limit        
qtree_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_6",oplocks="enabled",qtree="trident_qtree_pool_trident_TBWTPBZIMD",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 0
qtree_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_0",oplocks="enabled",qtree="harvestqtree",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="Kbyte",volume="astra_ci_vc_esxi_24_75_data_root"} 224
qtree_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_1",oplocks="enabled",qtree="astra_ci_vc_esxi_24_75_data_root",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="",volume="astra_ci_vc_esxi_24_75_data_root"} 0
qtree_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_2",oplocks="enabled",qtree="trident_pvc_a39048cd_6f45_4c42_b13b_fc00b83ca276",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 8388608
qtree_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_3",oplocks="enabled",qtree="trident_qtree_pool_trident_CGUEQCBMBI",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 0
qtree_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_4",oplocks="enabled",qtree="trident_pvc_c182b0a0_5c5f_488a_9600_3fbbca81093b",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 8388608
qtree_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_5",oplocks="enabled",qtree="trident_pvc_79d175b7_d8ef_49bb_a4dd_918c3da74383",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 20971520

curl -s http://localhost:13007/metrics | grep qtree_disk_limit | wc -l
       7

curl -s http://localhost:13006/metrics | grep quota_disk_limit    
quota_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_4",oplocks="enabled",qtree="trident_qtree_pool_trident_CGUEQCBMBI",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 0
quota_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_1",oplocks="enabled",qtree="harvestqtree",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="Kbyte",volume="astra_ci_vc_esxi_24_75_data_root"} 224
quota_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_3",oplocks="enabled",qtree="trident_pvc_a39048cd_6f45_4c42_b13b_fc00b83ca276",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 8388608
quota_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_5",oplocks="enabled",qtree="trident_pvc_c182b0a0_5c5f_488a_9600_3fbbca81093b",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 8388608
quota_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_6",oplocks="enabled",qtree="trident_pvc_79d175b7_d8ef_49bb_a4dd_918c3da74383",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 20971520
quota_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="default",index="A250-41-42-43_2",oplocks="enabled",qtree="astra_ci_vc_esxi_24_75_data_root",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="Kbyte",volume="astra_ci_vc_esxi_24_75_data_root"} 0
quota_disk_limit{cluster="A250-41-42-43",datacenter="zapi",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_7",oplocks="enabled",qtree="trident_qtree_pool_trident_TBWTPBZIMD",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 0

curl -s http://localhost:13006/metrics | grep quota_disk_limit | wc -l
       7

curl -s http://localhost:13007/metrics | grep quota_disk_limit        
quota_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_0",oplocks="enabled",qtree="harvestqtree",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="Kbyte",volume="astra_ci_vc_esxi_24_75_data_root"} 224
quota_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_1",oplocks="enabled",qtree="astra_ci_vc_esxi_24_75_data_root",security_style="unix",status="normal",svm="astra_ci_vc_esxi_24_75_data",type="tree",unit="",volume="astra_ci_vc_esxi_24_75_data_root"} 0
quota_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_2",oplocks="enabled",qtree="trident_pvc_a39048cd_6f45_4c42_b13b_fc00b83ca276",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 8388608
quota_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_3",oplocks="enabled",qtree="trident_qtree_pool_trident_CGUEQCBMBI",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="",volume="trident_qtree_pool_trident_CGUEQCBMBI"} 0
quota_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_4",oplocks="enabled",qtree="trident_pvc_c182b0a0_5c5f_488a_9600_3fbbca81093b",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 8388608
quota_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="default",index="A250-41-42-43_5",oplocks="enabled",qtree="trident_pvc_79d175b7_d8ef_49bb_a4dd_918c3da74383",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="Kbyte",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 20971520
quota_disk_limit{cluster="A250-41-42-43",datacenter="rest",export_policy="trident_qtree_pool_export_policy",index="A250-41-42-43_6",oplocks="enabled",qtree="trident_qtree_pool_trident_TBWTPBZIMD",security_style="unix",status="normal",svm="nfs_vserver",type="tree",unit="",volume="trident_qtree_pool_trident_TBWTPBZIMD"} 0

curl -s http://localhost:13007/metrics | grep quota_disk_limit | wc -l
       7

@cla-bot cla-bot bot added the cla-signed label May 2, 2023
@Hardikl Hardikl linked an issue May 2, 2023 that may be closed by this pull request
Ensure qtree REST template metrics matches ZAPI #1784
Closed
@rahulguptajss rahulguptajss merged commit 0e0f002 into release/23.05.0 May 2, 2023
7 checks passed
@rahulguptajss rahulguptajss deleted the hl_2305 branch May 2, 2023 13:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cgrinds cgrinds cgrinds approved these changes

@rahulguptajss rahulguptajss rahulguptajss approved these changes

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Ensure qtree REST template metrics matches ZAPI
3 participants
@Hardikl @cgrinds @rahulguptajss